From b36d9e286d8dbba881b11bb6dba10a7f418436a9 Mon Sep 17 00:00:00 2001 From: Mo Zhou Date: Sun, 22 Oct 2023 17:08:57 -0400 Subject: [PATCH] Refresh remaining patches. --- debian/patches/series | 2 - debian/patches/unicode-data-15.1.0.patch | 52 ----------- debian/patches/use-unicode-data.patch | 2 +- debian/patches/utf8proc_data-15.1.0.patch | 109 ---------------------- 4 files changed, 1 insertion(+), 164 deletions(-) delete mode 100644 debian/patches/unicode-data-15.1.0.patch delete mode 100644 debian/patches/utf8proc_data-15.1.0.patch diff --git a/debian/patches/series b/debian/patches/series index 5355a3b..6216540 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1 @@ use-unicode-data.patch -unicode-data-15.1.0.patch -utf8proc_data-15.1.0.patch diff --git a/debian/patches/unicode-data-15.1.0.patch b/debian/patches/unicode-data-15.1.0.patch deleted file mode 100644 index 95e95c8..0000000 --- a/debian/patches/unicode-data-15.1.0.patch +++ /dev/null @@ -1,52 +0,0 @@ -Index: utf8proc/CMakeLists.txt -=================================================================== ---- utf8proc.orig/CMakeLists.txt -+++ utf8proc/CMakeLists.txt -@@ -68,7 +68,7 @@ endif() - if(UTF8PROC_ENABLE_TESTING) - enable_testing() - file(MAKE_DIRECTORY data) -- set(UNICODE_VERSION 15.0.0) -+ set(UNICODE_VERSION 15.1.0) - file(DOWNLOAD https://www.unicode.org/Public/${UNICODE_VERSION}/ucd/NormalizationTest.txt ${CMAKE_BINARY_DIR}/data/NormalizationTest.txt SHOW_PROGRESS) - file(DOWNLOAD https://www.unicode.org/Public/${UNICODE_VERSION}/ucd/auxiliary/GraphemeBreakTest.txt ${CMAKE_BINARY_DIR}/data/GraphemeBreakTest.txt SHOW_PROGRESS) - add_executable(case test/tests.h test/tests.c utf8proc.h test/case.c) -Index: utf8proc/README.md -=================================================================== ---- utf8proc.orig/README.md -+++ utf8proc/README.md -@@ -59,7 +59,7 @@ The C library is found in this directory - and is named `libutf8proc.a` (for the static library) and - `libutf8proc.so` (for the dynamic library). - --The Unicode version supported is 15.0.0. -+The Unicode version supported is 15.1.0. - - For Unicode normalizations, the following options are used: - -Index: utf8proc/data/Makefile -=================================================================== ---- utf8proc.orig/data/Makefile -+++ utf8proc/data/Makefile -@@ -22,7 +22,7 @@ CharWidths.txt: charwidths.jl EastAsianW - $(JULIA) charwidths.jl > $@ - - # Unicode data version (must also update utf8proc_unicode_version function) --UNICODE_VERSION=15.0.0 -+UNICODE_VERSION=15.1.0 - - UnicodeData.txt: - cp /usr/share/unicode/UnicodeData.txt $@ -Index: utf8proc/utf8proc.c -=================================================================== ---- utf8proc.orig/utf8proc.c -+++ utf8proc/utf8proc.c -@@ -101,7 +101,7 @@ UTF8PROC_DLLEXPORT const char *utf8proc_ - } - - UTF8PROC_DLLEXPORT const char *utf8proc_unicode_version(void) { -- return "15.0.0"; -+ return "15.1.0"; - } - - UTF8PROC_DLLEXPORT const char *utf8proc_errmsg(utf8proc_ssize_t errcode) { diff --git a/debian/patches/use-unicode-data.patch b/debian/patches/use-unicode-data.patch index f550ee4..f034982 100644 --- a/debian/patches/use-unicode-data.patch +++ b/debian/patches/use-unicode-data.patch @@ -11,7 +11,7 @@ Index: utf8proc/data/Makefile --- utf8proc.orig/data/Makefile +++ utf8proc/data/Makefile @@ -25,37 +25,37 @@ CharWidths.txt: charwidths.jl EastAsianW - UNICODE_VERSION=15.0.0 + UNICODE_VERSION=15.1.0 UnicodeData.txt: - $(CURL) $(CURLFLAGS) -o $@ https://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/UnicodeData.txt diff --git a/debian/patches/utf8proc_data-15.1.0.patch b/debian/patches/utf8proc_data-15.1.0.patch deleted file mode 100644 index 2b0d47d..0000000 --- a/debian/patches/utf8proc_data-15.1.0.patch +++ /dev/null @@ -1,109 +0,0 @@ -diff --git a/utf8proc_data.c b/utf8proc_data.c -index 6a4ea26..0924d5b 100644 ---- a/utf8proc_data.c -+++ b/utf8proc_data.c -@@ -1680,14 +1680,14 @@ static const utf8proc_uint16_t utf8proc_stage1table[] = { - 13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, - 13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, - 13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, -- 13312, 13312, 13312, 13312, 42240, 28928, 28928, 28928, -+ 13312, 13312, 13312, 13312, 42240, 13312, 13312, 42496, - 28928, 28928, 28928, 28928, 28928, 28928, 28928, 28928, -- 28928, 42496, 42752, 43008, 28928, 28928, 28928, 28928, -+ 28928, 42752, 43008, 43264, 28928, 28928, 28928, 28928, - 28928, 13312, 13312, 13312, 13312, 13312, 13312, 13312, - 13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, -- 13312, 13312, 13312, 13312, 43264, 13312, 13312, 13312, -+ 13312, 13312, 13312, 13312, 43520, 13312, 13312, 13312, - 13312, 13312, 13312, 13312, 13312, 13312, 13312, 13312, -- 13312, 13312, 13312, 13312, 43520, 28928, 28928, 28928, -+ 13312, 13312, 13312, 13312, 43776, 28928, 28928, 28928, - 28928, 28928, 28928, 28928, 28928, 28928, 28928, 28928, - 28928, 28928, 28928, 28928, 28928, 28928, 28928, 28928, - 28928, 28928, 28928, 28928, 28928, 28928, 28928, 28928, -@@ -2035,7 +2035,7 @@ static const utf8proc_uint16_t utf8proc_stage1table[] = { - 28928, 28928, 28928, 28928, 28928, 28928, 28928, 28928, - 28928, 28928, 28928, 28928, 28928, 28928, 28928, 28928, - 28928, 28928, 28928, 28928, 28928, 28928, 28928, 28928, -- 28928, 43776, 44032, 28928, 28928, 28928, 28928, 28928, -+ 28928, 44032, 44288, 28928, 28928, 28928, 28928, 28928, - 28928, 28928, 28928, 28928, 28928, 28928, 28928, 28928, - 28928, 28928, 28928, 28928, 28928, 28928, 28928, 28928, - 28928, 28928, 28928, 28928, 28928, 28928, 28928, 28928, -@@ -2099,7 +2099,7 @@ static const utf8proc_uint16_t utf8proc_stage1table[] = { - 18176, 18176, 18176, 18176, 18176, 18176, 18176, 18176, - 18176, 18176, 18176, 18176, 18176, 18176, 18176, 18176, - 18176, 18176, 18176, 18176, 18176, 18176, 18176, 18176, -- 44288, 18176, 18176, 18176, 18176, 18176, 18176, 18176, -+ 44544, 18176, 18176, 18176, 18176, 18176, 18176, 18176, - 18176, 18176, 18176, 18176, 18176, 18176, 18176, 18176, - 18176, 18176, 18176, 18176, 18176, 18176, 18176, 18176, - 18176, 18176, 18176, 18176, 18176, 18176, 18176, 18176, -@@ -2131,7 +2131,7 @@ static const utf8proc_uint16_t utf8proc_stage1table[] = { - 18176, 18176, 18176, 18176, 18176, 18176, 18176, 18176, - 18176, 18176, 18176, 18176, 18176, 18176, 18176, 18176, - 18176, 18176, 18176, 18176, 18176, 18176, 18176, 18176, -- 44288, }; -+ 44544, }; - - static const utf8proc_uint16_t utf8proc_stage2table[] = { - 1, 2, 2, 2, 2, 2, 2, -@@ -3669,8 +3669,8 @@ static const utf8proc_uint16_t utf8proc_stage2table[] = { - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 3005, 3005, 3005, 3005, 3005, 3005, 3005, -- 3005, 3005, 3005, 3005, 3005, 0, 0, 0, -- 0, 3222, 3223, 3223, 3223, 3005, 3224, 3225, -+ 3005, 3005, 3005, 3005, 3005, 3005, 3005, 3005, -+ 3005, 3222, 3223, 3223, 3223, 3005, 3224, 3225, - 3226, 3227, 3228, 3227, 3228, 3227, 3228, 3227, - 3228, 3227, 3228, 3005, 3005, 3227, 3228, 3227, - 3228, 3227, 3228, 3227, 3228, 3229, 3230, 3231, -@@ -3732,7 +3732,7 @@ static const utf8proc_uint16_t utf8proc_stage2table[] = { - 3005, 3005, 3005, 3005, 3005, 3005, 3005, 3005, - 3005, 3005, 3005, 3005, 3005, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, -- 0, 3225, 3225, 3225, 3225, 3225, 3225, 3225, -+ 3005, 3225, 3225, 3225, 3225, 3225, 3225, 3225, - 3225, 3225, 3225, 3225, 3225, 3225, 3225, 3225, - 3225, 3460, 3461, 3462, 3463, 3464, 3465, 3466, - 3467, 3468, 3469, 3470, 3471, 3472, 3473, 3474, -@@ -7444,6 +7444,38 @@ static const utf8proc_uint16_t utf8proc_stage2table[] = { - 3225, 3225, 3225, 3225, 3225, 3225, 3225, 3225, - 3225, 3225, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, -+ 0, 3225, 3225, 3225, 3225, 3225, 3225, 3225, -+ 3225, 3225, 3225, 3225, 3225, 3225, 3225, 3225, -+ 3225, 3225, 3225, 3225, 3225, 3225, 3225, 3225, -+ 3225, 3225, 3225, 3225, 3225, 3225, 3225, 3225, -+ 3225, 3225, 3225, 3225, 3225, 3225, 3225, 3225, -+ 3225, 3225, 3225, 3225, 3225, 3225, 3225, 3225, -+ 3225, 3225, 3225, 3225, 3225, 3225, 3225, 3225, -+ 3225, 3225, 3225, 3225, 3225, 3225, 3225, 3225, -+ 3225, 3225, 3225, 3225, 3225, 3225, 3225, 3225, -+ 3225, 3225, 3225, 3225, 3225, 3225, 3225, 3225, -+ 3225, 3225, 3225, 3225, 3225, 3225, 3225, 3225, -+ 3225, 3225, 3225, 3225, 3225, 3225, 3225, 3225, -+ 3225, 3225, 3225, 3225, 3225, 3225, 3225, 3225, -+ 3225, 3225, 3225, 3225, 3225, 3225, 3225, 0, -+ 0, 0, 0, 0, 0, 0, 0, 0, -+ 0, 0, 0, 0, 0, 0, 0, 0, -+ 0, 0, 0, 0, 0, 0, 0, 0, -+ 0, 0, 0, 0, 0, 0, 0, 0, -+ 0, 0, 0, 0, 0, 0, 0, 0, -+ 0, 0, 0, 0, 0, 0, 0, 0, -+ 0, 0, 0, 0, 0, 0, 0, 0, -+ 0, 0, 0, 0, 0, 0, 0, 0, -+ 0, 0, 0, 0, 0, 0, 0, 0, -+ 0, 0, 0, 0, 0, 0, 0, 0, -+ 0, 0, 0, 0, 0, 0, 0, 0, -+ 0, 0, 0, 0, 0, 0, 0, 0, -+ 0, 0, 0, 0, 0, 0, 0, 0, -+ 0, 0, 0, 0, 0, 0, 0, 0, -+ 0, 0, 0, 0, 0, 0, 0, 0, -+ 0, 0, 0, 0, 0, 0, 0, 0, -+ 0, 0, 0, 0, 0, 0, 0, 0, -+ 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 7774, 7775, 7776, 7777, 7778, 4647, 7779, -- 2.30.2